executor: fix analyze cannot be killed #65249

hawkingrei · 2025-12-25T04:26:23Z

What problem does this PR solve?

Issue Number: close #65818

Problem Summary:

Analyze does not propagate cancellation context into RPC/NextRaw; killing the query can leave analyze workers blocked.

What changed and how does it work?

Pass SQLKiller-derived context into analyze workers and all V1 analyze column paths.
Replace context.TODO() with the propagated ctx in analyze V1 build/consume flow.
Add a failpoint-gated test to ensure analyze exits promptly after ctx cancellation.

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

hawkingrei · 2025-12-25T04:40:25Z

/retest

codecov · 2025-12-25T05:05:47Z

Codecov Report

❌ Patch coverage is 75.59242% with 103 lines in your changes missing coverage. Please review.
✅ Project coverage is 77.9980%. Comparing base (9b3495f) to head (f250aad).
⚠️ Report is 4 commits behind head on master.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #65249        +/-   ##
================================================
+ Coverage   77.7736%   77.9980%   +0.2243%     
================================================
  Files          2001       1922        -79     
  Lines        545596     533571     -12025     
================================================
- Hits         424330     416175      -8155     
+ Misses       119604     116954      -2650     
+ Partials       1662        442      -1220

Flag	Coverage Δ
integration	`44.1638% <36.7298%> (-3.9972%)`	⬇️
unit	`76.4018% <75.5924%> (-0.0102%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`56.7974% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`48.8309% <ø> (-12.1598%)`	⬇️

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

hawkingrei · 2025-12-29T02:30:27Z

/retest

Copilot

Pull request overview

This PR aims to make ANALYZE responsive to query kill/cancellation by propagating a SQLKiller-derived cancellation context into analyze workers and DistSQL/NextRaw paths, and adds a failpoint-based test to validate prompt exit on context cancellation.

Changes:

Add a SQLKiller-provided cancelable context (GetKillEventCtx) and propagate it through analyze execution paths.
Replace context.TODO() with a propagated ctx in several analyze V1/V2 build/consume flows and add ctx-aware worker loops.
Add a failpoint-gated unit test ensuring ANALYZE exits quickly after ctx cancellation.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
pkg/util/sqlkiller/sqlkiller.go	Introduces kill-event context support for cancellation propagation.
pkg/util/sqlkiller/BUILD.bazel	Adds dependency needed for new sqlkiller error usage.
pkg/executor/analyze.go	Threads kill-derived ctx into analyze workers.
pkg/executor/analyze_col.go	Propagates ctx into analyze V1 build/NextRaw flow.
pkg/executor/analyze_col_v2.go	Adds ctx plumbing/cancellation to analyze V2 sampling workers and NextRaw usage.
pkg/executor/analyze_idx.go	Adds ctx parameters through index analyze call chain and cancellation checks.
pkg/distsql/distsql.go	Adds failpoint to block until ctx cancellation for testing.
pkg/executor/test/analyzetest/analyze_test.go	Adds unit test validating analyze cancellation behavior.

pkg/util/sqlkiller/sqlkiller.go

pkg/executor/analyze_col_v2.go

pkg/executor/analyze.go

pkg/executor/analyze_idx.go

pkg/executor/analyze.go

pkg/util/sqlkiller/sqlkiller.go

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.

pkg/executor/analyze_col_v2.go

Copilot · 2026-01-26T10:27:13Z

pkg/executor/analyze_col_v2.go

+			statsHandle.FinishAnalyzeJob(results.Job, nil, statistics.TableAnalysisJob)
+			totalResult.results[results.Ars[0].Hist[0].ID] = results
+		case <-ctx.Done():
+			err = ctx.Err()


On cancellation, this path sets err = ctx.Err(), which loses the cancellation cause from SQLKiller.GetKillEventCtx (set via cancelFn(errKilled)). Consider using context.Cause(ctx) (falling back to ctx.Err()) so the caller can differentiate SQL kill vs plain context cancellation.

Suggested change

err = ctx.Err()

err = context.Cause(ctx)

if err == nil {

err = ctx.Err()

}

pkg/executor/analyze_col_v2.go

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.

pkg/executor/analyze_col_v2.go

pkg/util/sqlkiller/sqlkiller.go

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 5 comments.

pkg/executor/analyze_col_v2.go

pkg/distsql/distsql.go

pkg/executor/analyze_col_v2.go

pkg/util/sqlkiller/sqlkiller.go

pkg/executor/analyze_col_v2.go

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 1 comment.

pkg/executor/analyze.go

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

hawkingrei · 2026-01-30T10:15:49Z

/retest

YangKeao · 2026-01-30T11:41:00Z

/retest

ti-chi-bot · 2026-01-30T12:22:43Z

@hawkingrei: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-unit-test-next-gen	`f250aad`	link	true	`/test pull-unit-test-next-gen`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

YangKeao · 2026-01-30T12:25:57Z

/retest

ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 25, 2025

hawkingrei changed the title ~~executor: fix analyze cannot be killed~~ [WIP]executor: fix analyze cannot be killed Dec 25, 2025

ti-chi-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 25, 2025

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 31, 2025

hawkingrei changed the title ~~[WIP]executor: fix analyze cannot be killed~~ executor: fix analyze cannot be killed Jan 26, 2026

ti-chi-bot bot removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-tests-checked labels Jan 26, 2026

hawkingrei force-pushed the fix_cannot_kill_analyze branch from e93e052 to 253f0d7 Compare January 26, 2026 08:52

Copilot AI review requested due to automatic review settings January 26, 2026 08:52

Copilot started reviewing on behalf of hawkingrei January 26, 2026 08:52 View session

Copilot AI reviewed Jan 26, 2026

View reviewed changes

ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 26, 2026

Copilot AI review requested due to automatic review settings January 26, 2026 10:16

Copilot started reviewing on behalf of hawkingrei January 26, 2026 10:16 View session

Copilot AI reviewed Jan 26, 2026

View reviewed changes

ti-chi-bot bot removed the do-not-merge/needs-linked-issue label Jan 26, 2026

Copilot AI review requested due to automatic review settings January 26, 2026 13:08

Copilot started reviewing on behalf of hawkingrei January 26, 2026 13:08 View session

Copilot AI reviewed Jan 26, 2026

View reviewed changes

pkg/executor/analyze_col_v2.go Outdated Show resolved Hide resolved

pkg/util/sqlkiller/sqlkiller.go Outdated Show resolved Hide resolved

Copilot AI review requested due to automatic review settings January 26, 2026 13:54

Copilot started reviewing on behalf of hawkingrei January 26, 2026 13:55 View session

Copilot AI reviewed Jan 26, 2026

View reviewed changes

hawkingrei added 19 commits January 30, 2026 14:37

*

4812821

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

*: use context

64f3305

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

*

64e72d8

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

*

d686344

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

30fd1df

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

2dc0b32

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

011aa31

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

4ccfa54

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

90b5fa5

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

224081b

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

6f83757

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

643191f

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

e9c35aa

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

da96e11

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

60610cf

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

ee89249

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

4cb00b4

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

ff0aec8

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

cae7fa4

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

hawkingrei force-pushed the fix_cannot_kill_analyze branch from ed61b41 to cae7fa4 Compare January 30, 2026 06:39

hawkingrei requested a review from Copilot January 30, 2026 06:58

Copilot started reviewing on behalf of hawkingrei January 30, 2026 06:58 View session

Copilot AI reviewed Jan 30, 2026

View reviewed changes

pkg/executor/analyze.go Show resolved Hide resolved

hawkingrei added 3 commits January 30, 2026 15:10

executor: cancel analyze kill ctx on stop

e4f2a12

update

a7247c6

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

update

f250aad

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>

executor: fix analyze cannot be killed #65249

Are you sure you want to change the base?

executor: fix analyze cannot be killed #65249

Conversation

hawkingrei commented Dec 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

Uh oh!

hawkingrei commented Dec 25, 2025

Uh oh!

codecov bot commented Dec 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

hawkingrei commented Dec 29, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

hawkingrei commented Jan 30, 2026

Uh oh!

YangKeao commented Jan 30, 2026

Uh oh!

ti-chi-bot bot commented Jan 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

YangKeao commented Jan 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hawkingrei commented Dec 25, 2025 •

edited

Loading

codecov bot commented Dec 25, 2025 •

edited

Loading

ti-chi-bot bot commented Jan 30, 2026 •

edited

Loading